ref: refs/heads/BatchSerialFix
